Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added Jan '25 PCL & OECD PFAS #166

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Conversation

schymane
Copy link
Collaborator

...I had terrible issues with merging conflicts and syncing, I hope this is the right branch @meier-rene @sneumann but it got a lot worse when I tried dev...

...I had terrible issues with merging conflicts and syncing, I hope this is the right branch @meier-rene @sneumann but it got a lot worse when I tried dev...
@meier-rene
Copy link
Contributor

Your PR looks perfectly fine.
Regarding the merge conflicts: this issue was created by me, because I had to do a forced push. That breaks the repo for other users. It was not possible in another way to merge dev to master. I'm wondering that you managed to push it at all...

My suggestion to get back in sync is to delete your fork and fork again. Should have warned you before.

@meier-rene meier-rene merged commit 16637dc into ipb-halle:master Feb 3, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants